From b7a3863d9a0fd59010248ba59e584d84d4116f8f Mon Sep 17 00:00:00 2001 From: "emellor@leeni.uk.xensource.com" Date: Fri, 25 Nov 2005 17:05:45 +0000 Subject: [PATCH] Fix handling of devid_end when devid is an integer, but not present as a device. Signed-off-by: Ewan Mellor --- tools/python/xen/xend/server/blkif.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/python/xen/xend/server/blkif.py b/tools/python/xen/xend/server/blkif.py index d1b2fbbd7f..e41b239817 100644 --- a/tools/python/xen/xend/server/blkif.py +++ b/tools/python/xen/xend/server/blkif.py @@ -93,10 +93,11 @@ class BlkifController(DevController): try: DevController.destroyDevice(self, int(devid)) except ValueError: - devid_end = devid.split('/')[-1] + devid_end = type(devid) is str and devid.split('/')[-1] or None + for i in self.deviceIDs(): d = self.readBackend(i, 'dev') - if d == devid or d == devid_end: + if d == devid or (devid_end and d == devid_end): DevController.destroyDevice(self, i) return raise VmError("Device %s not connected" % devid) -- 2.30.2